ack, remove conflict marker
authorManish Singh <yosh@src.gnome.org>
Mon, 18 Feb 2002 20:32:58 +0000 (20:32 +0000)
committerManish Singh <yosh@src.gnome.org>
Mon, 18 Feb 2002 20:32:58 +0000 (20:32 +0000)
commit78c6308a01da27e159ff6c6ebe12660fc5472956
tree7a776755281ab755bb59c0a2e49435f53508dab6
parenta3b1cd22c444987759dc2af47828b5644879c5cc
ack, remove conflict marker
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8